Autogenerated HTML docs for v1.6.0-rc0-14-g95f8
diff --git a/git-rebase.txt b/git-rebase.txt index 51afc87..59c1b02 100644 --- a/git-rebase.txt +++ b/git-rebase.txt
@@ -39,8 +39,8 @@ completely automatic. You will have to resolve any such merge failure and run `git rebase --continue`. Another option is to bypass the commit that caused the merge failure with `git rebase --skip`. To restore the -original <branch> and remove the .git/rebase working files, use the command -`git rebase --abort` instead. +original <branch> and remove the .git/rebase-apply working files, use the +command `git rebase --abort` instead. Assume the following history exists and the current branch is "topic": @@ -398,7 +398,7 @@ Authors ------ -Written by Junio C Hamano <junkio@cox.net> and +Written by Junio C Hamano <gitster@pobox.com> and Johannes E. Schindelin <johannes.schindelin@gmx.de> Documentation
